metalink: Allow NULL for "out" params in metalink requests
authorMatthew Barnes <mbarnes@redhat.com>
Wed, 10 Jun 2015 18:37:42 +0000 (14:37 -0400)
committerGiuseppe Scrivano <gscrivan@redhat.com>
Fri, 26 Jun 2015 09:02:24 +0000 (11:02 +0200)
Caller may not be interested in all the outbound params, particularly
"fetching_sync_uri".

src/libostree/ostree-metalink.c

index cbe859f0743622b161bee6cf9083c5eaa6f6cbde..56bd12f17360f3cc73c291a5dbef5ed923760e64 100644 (file)
@@ -648,8 +648,10 @@ ostree_metalink_request_finish (OstreeMetalink         *self,
   if (g_task_propagate_boolean ((GTask*)result, error))
     {
       g_assert_cmpint (request->current_url_index, <, request->urls->len);
-      *out_target_uri = request->urls->pdata[request->current_url_index];
-      *out_data = g_strdup (request->result);
+      if (out_target_uri != NULL)
+        *out_target_uri = request->urls->pdata[request->current_url_index];
+      if (out_data != NULL)
+        *out_data = g_strdup (request->result);
       return TRUE;
     }
   else
@@ -708,7 +710,9 @@ _ostree_metalink_request_sync (OstreeMetalink        *self,
   data.out_data = out_data;
   data.loop = loop;
   data.error = error;
-  *fetching_sync_uri = _ostree_metalink_get_uri (self);
+
+  if (fetching_sync_uri != NULL)
+    *fetching_sync_uri = _ostree_metalink_get_uri (self);
 
   request->metalink = g_object_ref (self);
   request->urls = g_ptr_array_new_with_free_func ((GDestroyNotify) soup_uri_free);